diff --git a/docs/devices/hikey960.rst b/docs/devices/hikey960.rst
index 6aa2e0b..be301da 100644
--- a/docs/devices/hikey960.rst
+++ b/docs/devices/hikey960.rst
@@ -56,3 +56,7 @@
 $ lunch hikey960-userdebug
 $ make -j`nproc`
 
+
+Device Maintainer(s)
+********************
+- Yongqin Liu - <liuyq at #aosp-developers on OFTC IRC>
diff --git a/docs/devices/rb3.rst b/docs/devices/rb3.rst
index f5c53e8..e6b3462 100644
--- a/docs/devices/rb3.rst
+++ b/docs/devices/rb3.rst
@@ -120,3 +120,7 @@
 
    make TARGET_KERNEL_USE=mainline -j`nproc`'
 
+
+Device Maintainer(s)
+********************
+- Amit Pundir <pundir at #aosp-developers on OFTC IRC>
diff --git a/docs/devices/rb5.rst b/docs/devices/rb5.rst
index fe009c6..cd29547 100644
--- a/docs/devices/rb5.rst
+++ b/docs/devices/rb5.rst
@@ -128,3 +128,7 @@
 * WiFi-BT drivers are WIP and not upstreamed yet. You can find the patches here
   https://git.linaro.org/people/amit.pundir/linux.git/log/?h=rbX-mainline
 
+
+Device Maintainer(s)
+********************
+- Amit Pundir <pundir at #aosp-developers on OFTC IRC>
diff --git a/docs/introduction.rst b/docs/introduction.rst
index 5c0d9f4..1d576f5 100644
--- a/docs/introduction.rst
+++ b/docs/introduction.rst
@@ -42,9 +42,8 @@
 and documentation.
 
 
-
-Maintainer(s)
-*************
+Community Maintainer(s)
+***********************
 
 - Sumit Semwal <sumit.semwal@linaro.org>